Don't install private headers. (#463510)

2008-02-15  Matthias Clasen  <mclasen@redhat.com>

        * gdk/Makefile.am: Don't install private headers. (#463510)

        * gdk/gdkinternal.h: Include gdkmedialib.h here, not in
        the installed header gdkprivate.h.

svn path=/trunk/; revision=19595

diff --git a/ChangeLog b/ChangeLog
index 07b70057b751e780bddd4e99456bb18892ed4481..dc6b8017d2558a199a80d00770cdbbf98a4632d1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-02-15  Matthias Clasen  <mclasen@redhat.com>
+
+       * gdk/Makefile.am: Don't install private headers. (#463510)
+
+       * gdk/gdkinternal.h: Include gdkmedialib.h here, not in
+       the installed header gdkprivate.h.
+
 2008-02-15  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtknotebook.c (gtk_notebook_stop_reorder): Prevent

diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 7baec09371d9e07059e3e77e74154484ee322d5b..af3abae808ecb6196798dd54ce55cd2d9aac56f3 100644 (file)
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -17,7 +17,6 @@ EXTRA_DIST +=                 \
        makefile.msc            \
        gdk.symbols             \
        makegdkalias.pl         \
-       gdkaliasdef.c           \
        gdkenumtypes.c.template \
        gdkenumtypes.h.template \
        abicheck.sh             \
@@ -83,6 +82,7 @@ gdk_public_h_sources =                                \
        gdkpango.h                              \
        gdkpixbuf.h                             \
        gdkpixmap.h                             \
+       gdkprivate.h                            \
        gdkproperty.h                           \
        gdkregion.h                             \
        gdkrgb.h                                \
@@ -94,10 +94,10 @@ gdk_public_h_sources =                              \
        gdkvisual.h                             \
        gdkwindow.h
 
-gdk_headers =                     \
-       $(gdk_public_h_sources)   \
-       gdkenumtypes.h            \
-       gdkprivate.h              \
+gdk_built_public_sources =                     \
+       gdkenumtypes.h
+
+gdk_built_private_headers =                    \
        gdkalias.h
 
 gdk_c_sources =                 \
@@ -135,12 +135,20 @@ gdk_c_sources =                 \
        gdkvisual.c             \
        gdkwindow.c
 
+gdk_built_sources =                            \
+       gdkaliasdef.c                           \
+       gdkenumtypes.c                          \
+       gdkmarshalers.h                         \
+       gdkmarshalers.c                         \
+       $(gdk_built_public_sources)             \
+       $(gdk_built_private_headers)
+
 #
 # setup GDK sources and their dependencies
 #
 
 gdkincludedir = $(includedir)/gtk-2.0/gdk
-gdkinclude_HEADERS = $(gdk_headers)
+gdkinclude_HEADERS = $(gdk_public_h_sources) $(gdk_built_public_sources)
 
 # gdkmarshalers.c is not here because it is currently an empty file
 common_sources =                \
@@ -213,8 +221,8 @@ lib_LTLIBRARIES = $(gdktargetlib)
 
 EXTRA_LTLIBRARIES = libgdk-x11-2.0.la libgdk-win32-2.0.la libgdk-quartz-2.0.la libgdk-directfb-2.0.la
 
-MAINTAINERCLEANFILES = gdkenumtypes.h stamp-gdkenumtypes.h gdkenumtypes.c \
-  gdkmarshalers.h gdkmarshalers.c
+MAINTAINERCLEANFILES = $(gdk_built_sources) stamp-gdkenumtypes.h
+EXTRA_DIST += $(gdk_built_sources)
 EXTRA_HEADERS =
 
 #
@@ -235,13 +243,8 @@ if DISABLE_EXPLICIT_DEPS
 endif
 
 #note: not gdkconfig.h
-BUILT_SOURCES =                                        \
-       gdkalias.h                              \
-       gdkaliasdef.c                           \
-       gdkenumtypes.h                          \
-       gdkenumtypes.c                          \
-       gdkmarshalers.h                         \
-       gdkmarshalers.c                         \
+BUILT_SOURCES = \
+       $(gdk_built_sources)                    \
        gdkconfig.h
 
 gdkenumtypes.h: stamp-gdkenumtypes.h

diff --git a/gdk/gdkinternals.h b/gdk/gdkinternals.h
index 68df9a4dcc9d8da0d20d02aa7a92717e59704a87..a52bef1d94cb509e2bdc69ab4f8b73f337329275 100644 (file)
--- a/gdk/gdkinternals.h
+++ b/gdk/gdkinternals.h
@@ -26,13 +26,16 @@
 
 /* Uninstalled header defining types and functions internal to GDK */
 
+#ifndef __GDK_INTERNALS_H__
+#define __GDK_INTERNALS_H__
+
 #include <gio/gio.h>
 #include <gdk/gdktypes.h>
 #include <gdk/gdkwindow.h>
 #include <gdk/gdkprivate.h>
-
-#ifndef __GDK_INTERNALS_H__
-#define __GDK_INTERNALS_H__
+#ifdef USE_MEDIALIB
+#include <gdk/gdkmedialib.h>
+#endif
 
 G_BEGIN_DECLS
 

diff --git a/gdk/gdkprivate.h b/gdk/gdkprivate.h
index 29fc346e4e60d0d6aa343845dc82c15fc07ac0dd..95af2e151f9f11e83fe4090ac6e0bed5332fd40a 100644 (file)
--- a/gdk/gdkprivate.h
+++ b/gdk/gdkprivate.h
@@ -35,9 +35,6 @@
 #include <gdk/gdkregion.h>
 #include <gdk/gdkvisual.h>
 #include <gdk/gdkwindow.h>
-#ifdef USE_MEDIALIB
-#include <gdk/gdkmedialib.h>
-#endif
 
 G_BEGIN_DECLS